0000000000000000000000000000000000000000 05a11e054a4bc3bc8a6b4fe1945b32fbd25ba7c2 Killery <killery@Killery-no-iMac.local> 1354423485 -0800	commit (initial): Initial Commit
05a11e054a4bc3bc8a6b4fe1945b32fbd25ba7c2 b68e966040d85503d89169a49adab6f6ad56652c 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472686 +0900	commit: new
b68e966040d85503d89169a49adab6f6ad56652c 6d39d50e108a43d7d400d377af504e340922602c 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472765 +0900	commit: new
6d39d50e108a43d7d400d377af504e340922602c dd19591b96cd9ea2b60686fad7119a54180c9463 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472777 +0900	commit: new
dd19591b96cd9ea2b60686fad7119a54180c9463 3371f7ea321254aa6383b8f353827cb46fc87e36 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472790 +0900	commit: new
3371f7ea321254aa6383b8f353827cb46fc87e36 231fc6041cdd6a53760f6616b8d5af58082191ca 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472819 +0900	commit: new
231fc6041cdd6a53760f6616b8d5af58082191ca c2861e996ef3b75fc276c323040e501bcf0d8cbe 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472843 +0900	commit: new
c2861e996ef3b75fc276c323040e501bcf0d8cbe bd50bd622040790b805843dc8382e823441283b5 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472852 +0900	commit: new
bd50bd622040790b805843dc8382e823441283b5 275aefe07ed05ae37c102b407d8a91aef92c4990 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472862 +0900	commit: new
275aefe07ed05ae37c102b407d8a91aef92c4990 792009921ffab889e7351faf5ad36c7f1c180460 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472873 +0900	commit: new
792009921ffab889e7351faf5ad36c7f1c180460 8df4a8f570ac47c8879d8f66d374fc2218e43ff8 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472882 +0900	commit: new
8df4a8f570ac47c8879d8f66d374fc2218e43ff8 459dc5d56dd387c6f863288679a2c8acf80d9112 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472893 +0900	commit: new
459dc5d56dd387c6f863288679a2c8acf80d9112 f3d608a6522fa64eefdfd6b9bfe95268ce8fdab1 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472904 +0900	commit: new
f3d608a6522fa64eefdfd6b9bfe95268ce8fdab1 338d628b947f2362064915a02dec0999480ba1d9 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472915 +0900	commit: new
338d628b947f2362064915a02dec0999480ba1d9 c146c13ccaac73afcc9cd4bdc745923bcb3ccfb3 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472924 +0900	commit: new
c146c13ccaac73afcc9cd4bdc745923bcb3ccfb3 739f2d28ac3b18baaac266f198b72529d750f56b 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472933 +0900	commit: new
739f2d28ac3b18baaac266f198b72529d750f56b 805b1d5a0f2641e0ebde07071f114cd98284608c 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472943 +0900	commit: new
805b1d5a0f2641e0ebde07071f114cd98284608c b2637dce28f9ce46fd678272e6bbd6c126a17824 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472953 +0900	commit: new
b2637dce28f9ce46fd678272e6bbd6c126a17824 26ff3b649216c8b2efe8d30a6e3aa603c48347d8 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472961 +0900	commit: new
26ff3b649216c8b2efe8d30a6e3aa603c48347d8 6ad4a760dbbbb437e1c3830b2695374bab3e8f4e 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472970 +0900	commit: new
6ad4a760dbbbb437e1c3830b2695374bab3e8f4e 8b254222451c2ce8adfaf04b497f4e32e9a995f5 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430472979 +0900	commit: new
8b254222451c2ce8adfaf04b497f4e32e9a995f5 2231a3c6cb9fc098af013a39d169065803c69707 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430473012 +0900	commit: new
2231a3c6cb9fc098af013a39d169065803c69707 5f10354a2d1f3b66bda688a0f174674798f6876b 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430473030 +0900	commit: new
5f10354a2d1f3b66bda688a0f174674798f6876b f6115833819cbd05e181bd0ce65461c58204b5ba 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430473051 +0900	commit: new
f6115833819cbd05e181bd0ce65461c58204b5ba d2a7f248ae9921687e5fd2482667f4d7f8c94a0c 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1430473068 +0900	commit: new
d2a7f248ae9921687e5fd2482667f4d7f8c94a0c c65e27c5265e59de1bcc4dc7422954c6bff45269 Killery <Killery@kiritani-no-Mac-mini.local> 1430499115 +0900	commit: debugファイルが何も作られていない時ビルドすると落ちるのを改善
c65e27c5265e59de1bcc4dc7422954c6bff45269 13e10149f7a5640b78b5c2ad10fbe9967d476861 Killery <Killery@kiritani-no-Mac-mini.local> 1430499159 +0900	commit: 前の過程で少し変なところがあったので改善
13e10149f7a5640b78b5c2ad10fbe9967d476861 4401a53f1adf171df4f9ebe3f12e5831115f1ddb Killery <Killery@kiritani-no-Mac-mini.local> 1430527736 +0900	commit: ちょこっと修正
4401a53f1adf171df4f9ebe3f12e5831115f1ddb 713376d459afc37dfe9437c790410a3b590d49db Killery <Killery@kiritani-no-Mac-mini.local> 1430594462 +0900	commit: 攻撃方法を指定しないとクラッシュするのを修正
713376d459afc37dfe9437c790410a3b590d49db b647222e4fcbf10e7a65266c70cd9a157a29257d Killery <Killery@kiritani-no-Mac-mini.local> 1430612202 +0900	commit: ギャラリーの箇所を修正
b647222e4fcbf10e7a65266c70cd9a157a29257d 3543fdef04ce053c4da0ff9ead23c8f4fcd89cae Killery <Killery@kiritani-no-Mac-mini.local> 1430618994 +0900	commit: ギャラリーの動作正常化
3543fdef04ce053c4da0ff9ead23c8f4fcd89cae 6b242c3b57a776595338f07e897dc7e11bfc7be6 Killery <Killery@kiritani-no-Mac-mini.local> 1430645794 +0900	merge workSpace: Fast-forward
6b242c3b57a776595338f07e897dc7e11bfc7be6 c9010e95d02233e8294d884229f8fdda6674e4cd Killery <Killery@kiritani-no-Mac-mini.local> 1430645881 +0900	commit: master update
c9010e95d02233e8294d884229f8fdda6674e4cd e2f4ab02c94d17956cdf96093ff6b2c3c24befb1 Killery <Killery@kiritani-no-Mac-mini.local> 1434044426 +0900	merge workSpace: Merge made by the 'recursive' strategy.
e2f4ab02c94d17956cdf96093ff6b2c3c24befb1 3d95be4854430cc513b4bf0db11e99374ce5dd4c Killery <Killery@kiritani-no-Mac-mini.local> 1434044478 +0900	commit: ちょっとチェンジ
3d95be4854430cc513b4bf0db11e99374ce5dd4c 2ff481feffc3be3d855799e8d9cd2704cd594cae Killery <Killery@kiritani-no-Mac-mini.local> 1437534314 +0900	merge workSpace: Merge made by the 'recursive' strategy.
2ff481feffc3be3d855799e8d9cd2704cd594cae 1febc5db371a8c99e0815823c5923b5d26d5f40c 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1443026428 +0900	commit: change
1febc5db371a8c99e0815823c5923b5d26d5f40c 46476d5593e8755335503dd7ba713cb0b13e9c9a Killery <Killery@kiritani-no-Mac-mini.local> 1443026463 +0900	merge workSpace: Merge made by the 'recursive' strategy.
46476d5593e8755335503dd7ba713cb0b13e9c9a a56a6f1c2cf42e98d585f700ebea5979586a420c Killery <Killery@kiritani-no-Mac-mini.local> 1443193331 +0900	merge workSpace: Merge made by the 'recursive' strategy.
a56a6f1c2cf42e98d585f700ebea5979586a420c ec8fc1ae25db48424f0958d34df168124e56e007 Killery <Killery@kiritani-no-Mac-mini.local> 1443200554 +0900	merge workSpace: Merge made by the 'recursive' strategy.
ec8fc1ae25db48424f0958d34df168124e56e007 f75a78b308ffeb65393a33dd9a0c8290beb18ac9 Killery <Killery@kiritani-no-Mac-mini.local> 1445434352 +0900	merge workSpace: Merge made by the 'recursive' strategy.
f75a78b308ffeb65393a33dd9a0c8290beb18ac9 0b0e4ad8ec46a26c78cc1a8dac4bb66595952c06 Killery <Killery@kiritani-no-Mac-mini.local> 1451297038 +0900	merge workSpace: Merge made by the 'recursive' strategy.
0b0e4ad8ec46a26c78cc1a8dac4bb66595952c06 80ad60bc173606feaf002a4623feffed1aa831f6 Killery <Killery@kiritani-no-Mac-mini.local> 1451299095 +0900	merge workSpace: Merge made by the 'recursive' strategy.
80ad60bc173606feaf002a4623feffed1aa831f6 4325befe01fb8b72390e551c7095568c7ffc2fbb Killery <Killery@kiritani-no-Mac-mini.local> 1451327159 +0900	merge workSpace: Merge made by the 'recursive' strategy.
4325befe01fb8b72390e551c7095568c7ffc2fbb 00a5638aa706f98dba9f01fb7c2e5792c6d87602 Killery <Killery@kiritani-no-Mac-mini.local> 1451679501 +0900	merge workSpace: Merge made by the 'recursive' strategy.
00a5638aa706f98dba9f01fb7c2e5792c6d87602 f4911e4313855fa0f17d2ebacf280ac154c60e7c Killery <Killery@kiritani-no-Mac-mini.local> 1451705039 +0900	merge workSpace: Merge made by the 'recursive' strategy.
f4911e4313855fa0f17d2ebacf280ac154c60e7c ccf600ee951e28540d50d29ef037174803f537bb Killery <Killery@kiritani-no-Mac-mini.local> 1451706481 +0900	merge workSpace: Merge made by the 'recursive' strategy.
ccf600ee951e28540d50d29ef037174803f537bb 57b79727d6b21722fe004d0af5410e165bdd8f04 Killery <Killery@kiritani-no-Mac-mini.local> 1451716945 +0900	merge workSpace: Merge made by the 'recursive' strategy.
57b79727d6b21722fe004d0af5410e165bdd8f04 1e24f7e3a5c604df8c6e61f54dfa4075cd67b6a4 Killery <Killery@kiritani-no-Mac-mini.local> 1451718477 +0900	merge workSpace: Merge made by the 'recursive' strategy.
1e24f7e3a5c604df8c6e61f54dfa4075cd67b6a4 85f7713c582e5bbd5680c4f6320cd8a4cda1cd2c Killery <Killery@kiritani-no-Mac-mini.local> 1451730162 +0900	merge workSpace: Merge made by the 'recursive' strategy.
85f7713c582e5bbd5680c4f6320cd8a4cda1cd2c 3fd7cd4d232630ae4563696fe6f0f96f8d027525 Killery <Killery@kiritani-no-Mac-mini.local> 1451731552 +0900	merge workSpace: Merge made by the 'recursive' strategy.
3fd7cd4d232630ae4563696fe6f0f96f8d027525 03ba2a38fddd286af532335bfe058c9b2acaf996 Killery <Killery@kiritani-no-Mac-mini.local> 1451733212 +0900	merge workSpace: Merge made by the 'recursive' strategy.
03ba2a38fddd286af532335bfe058c9b2acaf996 8491371548c3ed35a4b491548180ede70bade98b Killery <Killery@kiritani-no-Mac-mini.local> 1451961103 +0900	merge workSpace: Merge made by the 'recursive' strategy.
8491371548c3ed35a4b491548180ede70bade98b da9abea2b0867e96524597f2df2878f10ad39f70 Killery <Killery@kiritani-no-Mac-mini.local> 1452321668 +0900	merge workSpace: Merge made by the 'recursive' strategy.
da9abea2b0867e96524597f2df2878f10ad39f70 1be11fd89fa74acd2e0c68437cf81f308442e7eb Killery <Killery@kiritani-no-Mac-mini.local> 1452322181 +0900	merge workSpace: Merge made by the 'recursive' strategy.
1be11fd89fa74acd2e0c68437cf81f308442e7eb d1ac1625cf94409447669410e784f4636fb7b9fe Killery <Killery@kiritani-no-Mac-mini.local> 1452322264 +0900	merge workSpace: Merge made by the 'recursive' strategy.
d1ac1625cf94409447669410e784f4636fb7b9fe d7697685142a732f9236f008d8e0ca2959ddbfd6 桐谷 諭史 <Killery@kiritani-no-Mac-mini.local> 1452324003 +0900	commit: bah
d7697685142a732f9236f008d8e0ca2959ddbfd6 d6586b8fc3ebbbf648a1358798e8c8dcf9c8555e Killery <Killery@kiritani-no-Mac-mini.local> 1452324014 +0900	merge workSpace: Merge made by the 'recursive' strategy.
d6586b8fc3ebbbf648a1358798e8c8dcf9c8555e c8650c0d50bdb09a76a6c71cafdd64e7ce9f73a7 Killery <Killery@kiritani-no-Mac-mini.local> 1452326911 +0900	merge workSpace: Merge made by the 'recursive' strategy.
c8650c0d50bdb09a76a6c71cafdd64e7ce9f73a7 93627773fb8778948369016d2c3ae0e8d7ecbd0d Killery <Killery@kiritani-no-Mac-mini.local> 1452329253 +0900	merge workSpace: Merge made by the 'recursive' strategy.
93627773fb8778948369016d2c3ae0e8d7ecbd0d e3f5f8db999478a4c6a976d7e03eab738173190c Killery <Killery@kiritani-no-Mac-mini.local> 1452341901 +0900	merge workSpace: Merge made by the 'recursive' strategy.
e3f5f8db999478a4c6a976d7e03eab738173190c c2a4807cbb9ce81c016ca89b8df5b87f7bf8aaaf Killery <Killery@kiritani-no-Mac-mini.local> 1452567926 +0900	merge workSpace: Merge made by the 'recursive' strategy.
c2a4807cbb9ce81c016ca89b8df5b87f7bf8aaaf 21d3b2d55c47d411fe2673df20edca601ffc8a63 Killery <Killery@kiritani-no-Mac-mini.local> 1453848537 +0900	merge workSpace: Merge made by the 'recursive' strategy.
21d3b2d55c47d411fe2673df20edca601ffc8a63 977c19452f1e47e2bfb38a3cda263d4bf0ee7c20 Killery <Killery@kiritani-no-Mac-mini.local> 1453851972 +0900	merge workSpace: Merge made by the 'recursive' strategy.
977c19452f1e47e2bfb38a3cda263d4bf0ee7c20 7815ad45d3a26bf852d212d68c4de41d1503cb00 Killery <Killery@kiritani-no-Mac-mini.local> 1454078804 +0900	merge workSpace: Merge made by the 'recursive' strategy.
7815ad45d3a26bf852d212d68c4de41d1503cb00 5ce8186c09f4bd439ab5bfd3a7f886587a0e1163 Killery <Killery@kiritani-no-Mac-mini.local> 1455070606 +0900	merge workSpace: Merge made by the 'recursive' strategy.
5ce8186c09f4bd439ab5bfd3a7f886587a0e1163 b519915d8695bf7b6c99c831e67efb7a7f1fa4cf Killery <Killery@kiritani-no-Mac-mini.local> 1455072758 +0900	merge workSpace: Merge made by the 'recursive' strategy.
b519915d8695bf7b6c99c831e67efb7a7f1fa4cf 84e3fe8a9c11b0516150f13c0249789e15d1aa7c Killery <Killery@kiritani-no-Mac-mini.local> 1455522163 +0900	merge workSpace: Merge made by the 'recursive' strategy.
84e3fe8a9c11b0516150f13c0249789e15d1aa7c 1842601f9d13d93b66135e745f805eecc721c087 Killery <Killery@kiritani-no-Mac-mini.local> 1455522335 +0900	merge workSpace: Merge made by the 'recursive' strategy.
1842601f9d13d93b66135e745f805eecc721c087 e4b3125076eb2050ab860f06cf075eeb3ff917f2 Killery <Killery@kiritani-no-Mac-mini.local> 1455933149 +0900	merge workSpace: Merge made by the 'recursive' strategy.
e4b3125076eb2050ab860f06cf075eeb3ff917f2 b3e08145adf6278340793e4b9d0644c1b116a3c9 Killery <Killery@kiritani-no-Mac-mini.local> 1456852920 +0900	merge workSpace: Merge made by the 'recursive' strategy.
b3e08145adf6278340793e4b9d0644c1b116a3c9 e7b520e699719487feaa16997acb4073731badb0 Killery <Killery@kiritani-no-Mac-mini.local> 1461084294 +0900	merge workSpace: Fast-forward
e7b520e699719487feaa16997acb4073731badb0 98ae2bc965ebab9e7b0a8f1f8d2185ba02a010f3 Killery <Killery@kiritani-no-Mac-mini.local> 1467055180 +0900	merge workSpace: Fast-forward
98ae2bc965ebab9e7b0a8f1f8d2185ba02a010f3 d13fedd7336096350cc2bbc437b2b10ebc1dddbc Killery <Killery@kiritani-no-Mac-mini.local> 1467057077 +0900	merge workSpace: Fast-forward
d13fedd7336096350cc2bbc437b2b10ebc1dddbc 27864bc2fe6134a1416b1ae016f975de5e41c1d8 Killery <Killery@kiritani-no-Mac-mini.local> 1467314425 +0900	merge workSpace: Fast-forward
27864bc2fe6134a1416b1ae016f975de5e41c1d8 c20fa849cd3931db0a83e032fb109a3d4078a19d Killery <Killery@kiritani-no-Mac-mini.local> 1469181399 +0900	merge workSpace: Fast-forward
c20fa849cd3931db0a83e032fb109a3d4078a19d c7f81526189ea41ca43e9b94f87a412109754d1a Killery <Killery@kiritani-no-Mac-mini.local> 1469183077 +0900	merge workSpace: Fast-forward
c7f81526189ea41ca43e9b94f87a412109754d1a 6d346490f931ce349d45eb08978a43b78e01209e Killery <Killery@kiritani-no-Mac-mini.local> 1469184002 +0900	merge workSpace: Fast-forward
6d346490f931ce349d45eb08978a43b78e01209e ef3785e5279b2eccb5be4e7fc192fbba6b542249 Killery <Killery@kiritani-no-Mac-mini.local> 1469190892 +0900	merge workSpace: Fast-forward
ef3785e5279b2eccb5be4e7fc192fbba6b542249 f3b2e968e5f5377f0ba33464b4549934ebdcaad9 Killery <Killery@kiritani-no-Mac-mini.local> 1469197982 +0900	merge workSpace: Fast-forward
f3b2e968e5f5377f0ba33464b4549934ebdcaad9 0c777d278d240ee39e9e9fd390fe1ed76bb21094 Killery <Killery@kiritani-no-Mac-mini.local> 1469202575 +0900	merge workSpace: Fast-forward
0c777d278d240ee39e9e9fd390fe1ed76bb21094 f9fdd0164c37ac0a484a0afaacd2626b66c72f58 Killery <Killery@kiritani-no-Mac-mini.local> 1469207378 +0900	merge workSpace: Fast-forward
f9fdd0164c37ac0a484a0afaacd2626b66c72f58 61df19a3e7a3757a671c8e0e69c5be26f307f33f Killery <Killery@kiritani-no-Mac-mini.local> 1469209621 +0900	merge workSpace: Fast-forward
61df19a3e7a3757a671c8e0e69c5be26f307f33f 74f3287f95a07e9febac95d6f0b8c1f4e8478602 Killery <Killery@kiritani-no-Mac-mini.local> 1469210154 +0900	merge workSpace: Fast-forward
74f3287f95a07e9febac95d6f0b8c1f4e8478602 ee14436ff2ccd0860e0a37495f66f74c72100fc5 Killery <Killery@kiritani-no-Mac-mini.local> 1469210908 +0900	merge workSpace: Fast-forward
ee14436ff2ccd0860e0a37495f66f74c72100fc5 6190791a78330267af5c176c2a6f6fa1bfc84fe1 Killery <Killery@kiritani-no-Mac-mini.local> 1469238666 +0900	merge workSpace: Fast-forward
6190791a78330267af5c176c2a6f6fa1bfc84fe1 b47f5f01a6c62ab42992d3db36d678895eed341c Killery <Killery@kiritani-no-Mac-mini.local> 1469238736 +0900	commit: committee
b47f5f01a6c62ab42992d3db36d678895eed341c cca7626e5f249549453088f338fe314366904d69 Killery <Killery@kiritani-no-Mac-mini.local> 1469242206 +0900	merge workSpace: Merge made by the 'recursive' strategy.
cca7626e5f249549453088f338fe314366904d69 728a864c89046ab89cfec04bd6e49642927ba654 Killery <Killery@kiritani-no-Mac-mini.local> 1469344168 +0900	merge workSpace: Merge made by the 'recursive' strategy.
728a864c89046ab89cfec04bd6e49642927ba654 1e7b76d920331c1290b7ad308a704919df545315 Killery <Killery@kiritani-no-Mac-mini.local> 1469938929 +0900	commit: 細かなバグを修正、スクリプトでステータスが決定できるように
1e7b76d920331c1290b7ad308a704919df545315 33b03d47a63be1353bd612a9107e7a4bc5e22557 Killery <Killery@kiritani-no-Mac-mini.local> 1470085414 +0900	merge workSpace: Fast-forward
33b03d47a63be1353bd612a9107e7a4bc5e22557 8b7aeee4537ad0c2cdce62db66750d5b3099eac4 Killery <Killery@kiritani-no-Mac-mini.local> 1470092963 +0900	merge workSpace: Fast-forward
8b7aeee4537ad0c2cdce62db66750d5b3099eac4 2ba30e774968dfaa60dfff97fd2624663cddac0a Killery <Killery@kiritani-no-Mac-mini.local> 1470106553 +0900	merge workSpace: Fast-forward
2ba30e774968dfaa60dfff97fd2624663cddac0a da900e15981d1bcec2435fe2d298f4de333c0487 Killery <Killery@kiritani-no-Mac-mini.local> 1470115552 +0900	merge workSpace: Fast-forward
da900e15981d1bcec2435fe2d298f4de333c0487 3b72e3ebf077dc80e55f4659bff5085a0b8cda8d Killery <Killery@kiritani-no-Mac-mini.local> 1470191824 +0900	merge workSpace: Fast-forward
3b72e3ebf077dc80e55f4659bff5085a0b8cda8d dba86ad2f9ed11d68300a5ddd9de8dc2d6ad32d2 Killery <Killery@kiritani-no-Mac-mini.local> 1470191868 +0900	commit: zOMG
dba86ad2f9ed11d68300a5ddd9de8dc2d6ad32d2 307abb8c2f37a46437d8a83f4545b7a618c7b720 Killery <Killery@kiritani-no-Mac-mini.local> 1470192011 +0900	commit: 消し忘れ注意！
307abb8c2f37a46437d8a83f4545b7a618c7b720 430c26f05fb21ce63d80cf2be302da06b0d9b452 Killery <Killery@kiritani-no-Mac-mini.local> 1470206502 +0900	merge workSpace: Fast-forward
